Undo previous change.

diff --git a/lisp/gosmacs.el b/lisp/gosmacs.el
index 359ea1cc344c739d02149c43a8017e5c8e0fd962..93bbbaa5b80aba1ec70e3870d6206040aa51b00c 100644 (file)
--- a/lisp/gosmacs.el
+++ b/lisp/gosmacs.el
@@ -46,7 +46,7 @@ Use \\[set-gnu-bindings] to restore previous global bindings."
           ("\C-x\C-n" next-error)
           ("\C-x\C-o" switch-to-buffer)
           ("\C-x\C-r" insert-file)
-          ("\C-x\C-u" undo-with-space)
+          ("\C-x\C-u" undo)
           ("\C-x\C-v" find-file-other-window)
           ("\C-x\C-z" shrink-window)
           ("\C-x!" shell-command)
@@ -114,21 +114,4 @@ From the window at the lower right corner, select the one at the upper left."
   (interactive)
   (recenter 0))
 
-(defun undo-with-space ()
-  "Enter an undo loop that continues while you type SPC characters.  Exit
-with ESC; any other character exits and begins a new command."
-  (interactive)
-  (undo-start)
-  (undo-more 1)
-  (message "Hit <space> to undo more")
-  (let ((event 32))
-    (while (equal event 32)
-      (message "undoing..")
-      (undo-more 1)
-      (message "Hit <space> to undo more")
-      (setq event (read-event)))
-    (message "Finished undoing.")
-    (if (not (equal event 27))
-       (setq unread-command-event event))))
-
 ;;; gosmacs.el ends here

diff --git a/lisp/novice.el b/lisp/novice.el
index 28ba34d206f0d63b30a55ad44933b775a503980c..2ddbbac325052bd2df0d34a242220be1d2071ba9 100644 (file)
--- a/lisp/novice.el
+++ b/lisp/novice.el
@@ -120,13 +120,4 @@ to future sessions."
    (insert "(put '" (symbol-name command) " 'disabled t)\n")
    (save-buffer)))
 
-;;;###autoload
-(defun enable-and-notify (&rest args)
-  "A novice hook for non-novices."
-  (put this-command 'disabled nil)
-  (message "You typed %s.  %s was disabled.  It's enabled now."
-          (key-description (this-command-keys)) this-command)
-  (sit-for 0)
-  (call-interactively this-command))
-
 ;;; novice.el ends here